| commit | ccc2f7606414a57fc7f34d2f88f8fb2246918d6d | [log] [tgz] |
|---|---|---|
| author | Junio C Hamano <junio@hera.kernel.org> | Thu Jul 24 04:03:33 2008 |
| committer | Junio C Hamano <junio@hera.kernel.org> | Thu Jul 24 04:03:33 2008 |
| tree | 086aa0acaa44a0fadc1de3344e5121f865623f32 | |
| parent | 0868a302deebe5253106fdf9af00c82e2c711e66 [diff] [blame] |
Autogenerated HTML docs for v1.6.0-rc0-42-g186458
diff --git a/git-rerere.txt b/git-rerere.txt index beebd53..89f321b 100644 --- a/git-rerere.txt +++ b/git-rerere.txt
@@ -37,7 +37,7 @@ 'clear':: This resets the metadata used by rerere if a merge resolution is to be -is aborted. Calling 'git-am --skip' or 'git-rebase [--skip|--abort]' +aborted. Calling 'git-am [--skip|--abort]' or 'git-rebase [--skip|--abort]' will automatically invoke this command. 'diff'::